Autogenerated HTML docs for v1.5.2.1-174-gcd03
diff --git a/git-config.html b/git-config.html index a5dc1e0..59b7149 100644 --- a/git-config.html +++ b/git-config.html
@@ -1453,7 +1453,7 @@ <p> Controls which merge resolution program is used by <a href="git-mergetool.html">git-mergetool(l)</a>. Valid values are: "kdiff3", "tkdiff", - "meld", "xxdiff", "emerge", "vimdiff", and "opendiff" + "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", and "opendiff". </p> </dd> <dt> @@ -1777,7 +1777,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 08-Jun-2007 16:08:05 UTC +Last updated 11-Jun-2007 01:21:26 UTC </div> </div> </body>
